Calculate the buttons size request before using it. Fixes #61696.

2001-10-29  Anders Carlsson  <andersca@gnu.org>

	* gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
	the buttons size request before using it. Fixes #61696.

diff --git a/ChangeLog b/ChangeLog
index 9a4d3894f5497aad6bc124f9f84800759c870df0..a2f32f86dcc1229be987760dff91f63e3858b1a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-29  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
+       the buttons size request before using it. Fixes #61696.
+
 2001-10-29  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Updates.
@@ -85,6 +90,7 @@
        file. Install import libraries.
 
 2001-10-29  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2482
 
        * gtk/gtkiconfactory.c (get_default_icons): Fix build.
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9a4d3894f5497aad6bc124f9f84800759c870df0..a2f32f86dcc1229be987760dff91f63e3858b1a4 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-10-29  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
+       the buttons size request before using it. Fixes #61696.
+
 2001-10-29  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Updates.
@@ -85,6 +90,7 @@
        file. Install import libraries.
 
 2001-10-29  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2482
 
        * gtk/gtkiconfactory.c (get_default_icons): Fix build.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9a4d3894f5497aad6bc124f9f84800759c870df0..a2f32f86dcc1229be987760dff91f63e3858b1a4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-10-29  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
+       the buttons size request before using it. Fixes #61696.
+
 2001-10-29  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Updates.
@@ -85,6 +90,7 @@
        file. Install import libraries.
 
 2001-10-29  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2482
 
        * gtk/gtkiconfactory.c (get_default_icons): Fix build.
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9a4d3894f5497aad6bc124f9f84800759c870df0..a2f32f86dcc1229be987760dff91f63e3858b1a4 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-10-29  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
+       the buttons size request before using it. Fixes #61696.
+
 2001-10-29  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Updates.
@@ -85,6 +90,7 @@
        file. Install import libraries.
 
 2001-10-29  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2482
 
        * gtk/gtkiconfactory.c (get_default_icons): Fix build.
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9a4d3894f5497aad6bc124f9f84800759c870df0..a2f32f86dcc1229be987760dff91f63e3858b1a4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-10-29  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
+       the buttons size request before using it. Fixes #61696.
+
 2001-10-29  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Updates.
@@ -85,6 +90,7 @@
        file. Install import libraries.
 
 2001-10-29  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2482
 
        * gtk/gtkiconfactory.c (get_default_icons): Fix build.
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9a4d3894f5497aad6bc124f9f84800759c870df0..a2f32f86dcc1229be987760dff91f63e3858b1a4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-10-29  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
+       the buttons size request before using it. Fixes #61696.
+
 2001-10-29  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Updates.
@@ -85,6 +90,7 @@
        file. Install import libraries.
 
 2001-10-29  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2482
 
        * gtk/gtkiconfactory.c (get_default_icons): Fix build.
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9a4d3894f5497aad6bc124f9f84800759c870df0..a2f32f86dcc1229be987760dff91f63e3858b1a4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-10-29  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
+       the buttons size request before using it. Fixes #61696.
+
 2001-10-29  Tor Lillqvist  <tml@iki.fi>
 
        * README.win32: Updates.
@@ -85,6 +90,7 @@
        file. Install import libraries.
 
 2001-10-29  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2482
 
        * gtk/gtkiconfactory.c (get_default_icons): Fix build.
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 57563244e1c1995330b6f5ada6826d52e4db24ea..2a1253817d0a5320c90b651df5378ef7654cd378 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1380,6 +1380,8 @@ gtk_tree_view_size_request (GtkWidget      *widget,
 
   tree_view = GTK_TREE_VIEW (widget);
 
+  gtk_tree_view_size_request_buttons (tree_view);
+
   requisition->width = tree_view->priv->width;
   requisition->height = tree_view->priv->height + tree_view->priv->header_height;
 
@@ -1395,8 +1397,6 @@ gtk_tree_view_size_request (GtkWidget      *widget,
       if (GTK_WIDGET_VISIBLE (child->widget))
         gtk_widget_size_request (child->widget, &child_requisition);
     }
-
-  gtk_tree_view_size_request_buttons (tree_view);
 }
 
 /* GtkWidget::size_allocate helper */